ixp: move pci init in arm/board instead of cpu

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c
index 27872fb78473bb63fde2b21cad04e889a44b6502..fd545b5a254c16bc03f126e0aa6fbc75534096de 100644 (file)
--- a/cpu/ixp/cpu.c
+++ b/cpu/ixp/cpu.c
@@ -86,9 +86,6 @@ int cpu_init (void)
        FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
 
-#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
-       pci_init();
-#endif
        return 0;
 }
 

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 2358bebdbde86689306a18323ae0e267e4f99424..964f5cc5f2921448b0ed60347f4255c113f4fe8e 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -221,6 +221,15 @@ static int init_func_i2c (void)
 }
 #endif
 
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+#include <pci.h>
+static int arm_pci_init(void)
+{
+       pci_init();
+       return 0;
+}
+#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
+
 /*
  * Breathe some life into the board...
  *
@@ -267,6 +276,9 @@ init_fnc_t *init_sequence[] = {
        init_func_i2c,
 #endif
        dram_init,              /* configure available RAM banks */
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+       arm_pci_init,
+#endif
        display_dram_config,
        NULL,
 };